Merge.
authoradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 17 Aug 2005 20:33:56 +0000 (12:33 -0800)
committeradsharma@los-vmm.sc.intel.com <adsharma@los-vmm.sc.intel.com>
Wed, 17 Aug 2005 20:33:56 +0000 (12:33 -0800)

Trivial merge